merge master
authorJoakim Verona <joakim@verona.se>
Thu, 22 Jan 2015 11:52:42 +0000 (12:52 +0100)
committerJoakim Verona <joakim@verona.se>
Thu, 22 Jan 2015 11:52:42 +0000 (12:52 +0100)

Trivial merge